Finished basic changes - needs styling