#5 #6 WIP (more)