Need tips to make this more functional