I need to revamp this thing after my absence...