First commit with working file
Updated to fix scroll