I feel like this isn't finished just yet, suggestions?