Working array struct storage

Signed-off-by: Thomas <Thomas@tommyt.com.au>